From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Tue, 8 Mar 2011 05:33:52 +0000 (-0500)
Subject: Fix srcdir != builddir issues
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8750
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8dcd08f47ebaef0feb2ffb930b17a6d33421d637;p=gnome-shell.git

Fix srcdir != builddir issues

* calendar-server subdirectory of build directory needs to
  be created.
* Generate shell-enum-types.c/.h in build directory rather than
  in the possibly-read-only source directory.
---

diff --git a/src/Makefile-calendar-server.am b/src/Makefile-calendar-server.am
index e617668ee..217243230 100644
--- a/src/Makefile-calendar-server.am
+++ b/src/Makefile-calendar-server.am
@@ -4,7 +4,9 @@ service_in_files = calendar-server/org.gnome.Shell.CalendarServer.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
 
 $(service_DATA): $(service_in_files) Makefile
-	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@.tmp && mv $@.tmp $@
+	$(AM_V_GEN)									\
+		[ -d $(@D) ] || $(mkdir_p) $(@D) ;					\
+		sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@.tmp && mv $@.tmp $@
 
 libexec_PROGRAMS += gnome-shell-calendar-server
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 6e93d4ed3..83d5889e7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -225,9 +225,9 @@ stamp-shell-enum-types.h: $(srcdir)/shell-enum-types.h.in $(shell_public_headers
 	$(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
 	    --template $< \
-	  $(shell_public_headers_h) ) > $@.tmp && \
-	(cmp -s $@.tmp shell-enum-types.h || mv $@.tmp shell-enum-types.h) && \
-	rm -f $@.tmp && \
+	  $(shell_public_headers_h) ) > $(@F).tmp && \
+	(cmp -s $(@F).tmp shell-enum-types.h || mv $(@F).tmp shell-enum-types.h) && \
+	rm -f $(@F).tmp && \
 	echo timestamp > $(@F)
 EXTRA_DIST += shell-enum-types.h.in
 CLEANFILES += stamp-shell-enum-types.h
@@ -236,9 +236,9 @@ shell-enum-types.c: shell-enum-types.c.in stamp-shell-enum-types.h
 	$(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
 	    --template $< \
-	  $(shell_public_headers_h) ) > $@.tmp && \
-	mv $@.tmp $@ && \
-	rm -f $@.tmp
+	  $(shell_public_headers_h) ) > $(@F).tmp && \
+	mv $(@F).tmp $(@F) && \
+	rm -f $(@F).tmp
 EXTRA_DIST += shell-enum-types.c.in
 
 libgnome_shell_la_LDFLAGS = -avoid-version